Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 5 Jun 2015 13:35:49 +0000 (14:35 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 5 Jun 2015 13:35:49 +0000 (14:35 +0100)
commitecdae1cfaa7f6123decaa1b9d7205c3ff726b941
treeb016269ab9c22c0fe96481402cb8b2512b659c2c
parent6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037
parent712bdd018502f9bf88bb761ea648860bb0302d3b
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging